Revert "Merge pull request #1 from richhiggins/master"
Merge pull request #2 from richhiggins/revert-1-master

Revert "Merge pull request #1 from richhiggins/master"