Merge pull request #24 from torrmercury/Johnny!

Taggin’ dat wood
Merge branch 'newmaster' into Johnny!

* newmaster: