Merge pull request #3 from GarryWest/gh-pages

Update master from gh-pages