Um. Fixes of Derps.
Merge pull request #12 from TechCavern/master

Um. Fixes of Derps.