fix some bug
Merge branches 'master' and 'master' of https://github.com/hiendv2210/MonsterCrashHomeRun1.0