Merge pull request #4 from markdessain/gh-pages

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

Merge pull request #4 from markdessain/gh-pages