0.2.1 changelog and version bump
Merge remote-tracking branch 'origin/master'