Updates to 0.4.0
Merge branch 'release/0.4.0' into develop