Set version number for release
Merge branch 'release-0.4.0' into develop
Upped version for next release