Merge branch 'hotfix/0.0.6' into develop
Merge branch 'develop'