Merge branch 'develop' into version-0.4.0
Bump version
Merge branch 'version-0.4.0' into develop