Merge pull request #11 from stephane/master