Fix merge
Merge pull request #3 from julienp/master

Fix merge