Merge branch 'master' into develop
Version bump to 0.2.2
fixes #1
Merge branch 'release-0.2.2'