Merge pull request #14 from TopherJonesy/gh-pages

3.6.2
4.2.3
Merge pull request #15 from TopherJonesy/master

4.2.3