Taggin’ dat wood
Merge pull request #24 from torrmercury/Johnny!

Taggin’ dat wood
No more clones.
Merge pull request #25 from torrmercury/Johnny!

No more clones.
Merge branch 'Matt' into newmaster