Merge pull request #11 from TopherJonesy/master

yo mama