Merge pull request #52 from cyrille-leclerc/master

Various enhancements