Merge branch 'develop'
Prepare 0.2.2 release
Merge branch 'master' into develop