Fix
Merge branch 'hotfix/v0.0.2'