Merge branch 'master' into develop
rename
Version bump to 0.4
build commit v0.4
Merge branch 'release-0.4'