Merge pull request #3 from connyay/master

merge into gh-pages
Merge pull request #4 from connyay/gh-pages

Merge pull request #3 from connyay/master