Merge branch 'hotfix/0.2.1'
Forgot to bump version
Merge branch 'hotfix/0.2.1b' into develop