change version
Merge branch 'release_0.4.0'
Merge branch 'master' into develop