Merge branch 'development': Ready for v0.2.2
Merge branch 'master' into development