Merge pull request #13 from simonpasquier/merge-master-branch

Merge master branch