2.2 release
Merge pull request #200 from baptistelebail/master

2.2 release, fixed markup and UI issues