Migrate to 0.2.2
Merge branch 'dev'