Merge branch 'hotfix/0.0.1a'
Merge branch 'master' into develop