Merge pull request #150 from gwenn/misc

Misc