Merge pull request #4 from mcdlee/gh-pages

Merge pull request #3 from mcdlee/master
Merge pull request #5 from mcdlee/master

Merge pull request #4 from mcdlee/gh-pages