Merge pull request #140 from gwenn/misc

Prepare 2.0 release