bug fixes
Merge branch 'master' of https://github.com/code-11/Shadow_Cannibal_Resort