Merge pull request #1 from Shockwave52/master

derp
johoo
derp
Merge pull request #1 from TDC-Insane/master

Johoo