Ready for 0.4.0 release
Merge branch 'release/v0.4.0' into develop