Merge branch 'release/v0.5.0' (early part)
fix version number
Merge branch 'master' into develop