Releasing 0.2.1
Merge remote-tracking branch 'upstream/master'

* upstream/master: