Merge pull request #1 from nearnshaw/master

updating gh pages from master
Merge pull request #2 from nearnshaw/gh-pages

2nd update