Merge branch 'release/0.5.0' into develop
0.5.1
Merge branch 'release/0.5.1'