wtf github...???

Merge pull request #17 from TopherJonesy/master