Build 0.4
Merge branch 'release-0.4' into develop