Merge branch 'v0.2.2'
Merge branch 'master' into v0.2.2