setting version to 0.4.0 for release
Merge branch 'release/0.4.0' into develop