Merge branch 'release-0.2.0'
Bump version 0.2.1
Change log message
Merge branch 'hotfix-0.2.1' into develop