Merge branch 'release/0.0.4' into develop
WIP
Improvements
Merge branch 'develop'
v0.0.5