version bumped to 0.4.0
Merge branch 'master' into develop
tag branch after a merge
Merge branch 'release-0.4.0'