Merge branch 'develop' for milestone v0.2.0
Merge branch 'develop' for milestone v0.3.0
Merge branch 'master' into develop