Merge branch 'master' into develop
0.2.2 released
Merge branch 'develop'