Merge pull request #37 from terrymun/master

Updating gh-pages with master
Merge pull request #38 from terrymun/gh-pages

Merge pull request #37 from terrymun/master