Fix bug in hearting
Merge branch 'master' into ChineseVersion