Merge pull request #10 from msimonin/develop

Develop