Same as in the tarball
Merge pull request #2 from sylvestre/master

Same as in the tarball