Merge pull request #15 from TopherJonesy/master

4.2.3
Merge pull request #16 from TopherJonesy/gh-pages

Merge pull request #15 from TopherJonesy/master