Merge pull request #1 from cyrille-leclerc/master

Cleanup code before release