Merge pull request #1 from chris-hammersley/master

Fixes after Validation
Merge pull request #2 from chris-hammersley/gh-pages

Merge pull request #1 from chris-hammersley/master