Merge branch 'release/0.4' into develop
Merge branch 'master' into develop
Version bump for 0.5
Merge branch 'release/0.5'
Updated changelog for 0.5