Commit.
Merge tag 'v0.2.1'

Adding tag.
Merge remote-tracking branch 'remotes/origin/master' into v0.1