#488 resolved. Finish v0.5.2.
Merge branch 'master' into develop