v0.4
Merge branch 'release' into develop