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