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