Merge branch 'hotfix/0.0.7'
Merge branch 'develop'
no message