Merge pull request #5 from paulmarsy/master

Merge