2.2 release, bug fixes
Merge pull request #192 from baptistelebail/master

2.2 release, bug fixes