bug fixes
Merge branch 'hotfix/0.2.1' into develop
Merge branch 'hotfix/0.2.1'
Merge branch 'develop'