v0.0.4
Merge branch 'release-0.0.4'
Merge branch 'master' into develop
bump version for development