Merge pull request #23 from msimonin/develop

Develop