#83 Finish v0.5.1
#93 Resolved. Finish v0.5.2.
Merge branch 'master' into develop