Housekeeping.
Bumped version and updated changelog.
Merge branch 'release/0.2.1'