herp
merge
Merge pull request #3 from Tethik/master

herpaderp