cleanup for 0.5.x
version 0.5.0
Merge branch 'release/0.5.0' into develop