lots of stuff
Merge pull request #1 from CthuluPriest/master

pull it, baby