Clean
Merge branch 'master' into develop
v0.5.1
Merge branch 'release/v0.5.1'