Revert "Merge pull request #1 from mike-quayle/master"