Merge pull request #3 from TopherJonesy/master

1.4
Merge pull request #4 from TopherJonesy/gh-pages

Merge pull request #3 from TopherJonesy/master