Merge branch 'release/v0.4.0'
Merge commit 'release/v0.4.0' into development