Commit message:
Merge pull request #199 from ThePyrotechnic/Dev

Commit message: