Error Fix
Merge branch 'master' of https://github.com/jwvg0425/ProjectArthas