Merge pull request #66 from cyrille-leclerc/master

Minor cleanup