Merge pull request #7 from ams-bjones/gh-pages

More up to date pull request
Merge pull request #1 from ams-ICT/gh-pages

catchup