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