Merge tag '0.4.0' into develop

0.4.0
Bump version 0.5.0
Merge branch 'release/0.5.0'