Misc improvements
Merge pull request #263 from fabienrohrer/master

Misc improvements