fix bug 317, 318, 319
conflict
Merge branch 'master' of https://github.com/hiendv2210/MonsterCrashHomeRun1.0