Merge pull request #2 from decaywood/master

Merge pull request #1 from decaywood/origin/newBranch
Revert "Merge pull request #1 from decaywood/origin/newBranch"
Merge pull request #3 from decaywood/revert-2-master

master