Merge pull request #3 from GarryWest/gh-pages

Update master from gh-pages
Merge pull request #4 from GarryWest/master

Merge pull request #3 from GarryWest/gh-pages