Fixes #217
Merge branch 'master' of https://github.com/herp-a-derp/Corruption-of-Champions