Merge pull request #93 from msimonin/develop

Develop