Merge branch 'release/0.4.0'
Merge branch 'master' into develop