#481 Finish v0.5.1
Merge branch 'master' into develop