Merge pull request #4 from simonpasquier/merge-master

Merge master