Merge pull request #3 from mikesherson/gh-pages

merging changes
Merge pull request #4 from mikesherson/master

Merge pull request #3 from mikesherson/gh-pages