Merge branch 'develop'
Release 0.2.1
Bump to 0.2.2-SNAPSHOT