Merge pull request #1 from arthurattwell/master

Master to gh-pages