Merge branch 'develop'
Bump to v0.2.2
Update doc for wiki
Merge branch 'master' into develop