Merge pull request #1 from charlesdguthrie/master

pull request from master to gh pages
Merge pull request #2 from charlesdguthrie/gh-pages

Merge pull request #1 from charlesdguthrie/master