Merge pull request #157 from gwenn/misc

Misc