Version bumped from 0.2 to 0.2.1
Merge branch 'release-0.2.1'