Done
Merge branch 'release/v0.4' into develop