Merge pull request #1 from msimonin/master

Initial commit.