I am derp.
Still a derp.
Gosh, I'm still a derp.
Merge pull request #60 from warlordjones/master

Fixed my MergeDerps