Update to 0.2.1
Merge branch 'develop'