Bump version number (properly this time)
Merge branch 'release/0.2.1' into develop