Merges branch 'release/0.4' into develop
Bump up to v0.5
Merges branch 'release/0.5'