Applying hotfix to v0.0.1
Merge branch 'hotfix/v0.0.1'