Merge pull request #1 from arthurattwell/master

Master to gh-pages
Merge pull request #2 from arthurattwell/gh-pages

Merge pull request #1 from arthurattwell/master