Merge pull request #251 from andygup/gh-pages

v2.2 updates for gh-pages