Bump version number to 0.2.1
Merge branch 'development'