Merge pull request #4 from cyrille-leclerc/master

cleanup