Beginning of the end~
Merge branch 'master' of https://github.com/TricksterGuy/brandontools