Update to v0.2.1
Merge pull request #1661 from rthor/master

Update to v0.2.1