Merge branch 'hotfix/0.0.2' into develop
Merge branch 'develop'