Merge branch 'hotfix/v0.0.3' into develop
Fix
Merge branch 'release/v0.0.4'