More shit.
Merge pull request #214 from ThePyrotechnic/Dev

More shit.