Merge branch 'release/0.0.1'
fix
Merge branch 'hotfix/1' into develop