Merge branch 'release/0.5.0'
Release 0.5.1, fix some bugs
Merge branch 'release/0.5.1'
Merge branch 'release/0.5.1' into develop
Merge branch 'master' into develop