Merge branch 'release/v-0.0.4'
fix
Merge branch 'hotfix/fix-0.0.4.1' into develop