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