Merge branch 'release/0.4' into develop
Version bump
Merge branch 'release/0.5'