Fix issues in bug: https://github.com/herp-a-derp/Corruption-of-Champions/issues/403#issuecomment-42401173
Merge branch 'master' of github.com:herp-a-derp/Corruption-of-Champions