Merge pull request #37 from terrymun/master

Updating gh-pages with master