Merge pull request #255 from andygup/gh-pages

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

v2.3 gh-pages
Merge branch 'master' into gh-pages
Merge pull request #263 from andygup/gh-pages

v2.3.1
Wording clarification
update changelog.
Merge pull request #265 from andygup/fix_wording

Fix wording.