Merge pull request #201 from ThePyrotechnic/Dev

It's been 4 hours...
Temporary faction workaround