Version 0.2.2
Merge branch 'master' into gh-pages