Here we go... DERPINESS FIXED
Merge pull request #49 from MagiciansArtificeTeam/dev

Here we go... DERPINESS FIXED