Merge pull request #1 from TopherJonesy/master

Sync
Merge pull request #2 from TopherJonesy/gh-pages

1.3