Fixed merge issues
Merge branch 'master' of https://github.com/CoreModding/CORE-API