Bumped version to v0.2.1.dev
Merge branch 'master' into 0.2.x