Update to 0.2.1
Merge branch 'master' into osx-release