minor update
Merge branch 'v0.2.2'