Update to v0.4.0
Merge branch 'release/v0.4.0' into develop