Fix bug 470
Merge branch 'master' of https://github.com/nynohu/MonsterHomeCrash
no message
Merge branch 'master' of https://github.com/nynohu/MonsterHomeCrash