prep for v0.5
Merge branch 'release/0.5.0'
Merge branch 'master' into develop