Bumping version
bump version & some minor cleanups
Merge branch 'release/0.2.1' into develop
Bump readme