Merge pull request #255 from andygup/gh-pages

Update gh-pages
Merge pull request #260 from andygup/gh-pages

v2.3 gh-pages