Merge pull request #1 from charlesdguthrie/master

pull request from master to gh pages