bug fix 1
Merge branch 'master' of https://github.com/shazichuanhuo/heat_final_version
Merge branch 'master' of https://github.com/shazichuanhuo/heat_final_version
Merge branch 'master' of https://github.com/shazichuanhuo/heat_final_version
Merge branch 'master' of https://github.com/shazichuanhuo/heat_final_version
Merge branch 'master' of https://github.com/shazichuanhuo/heat_final_version
fix bug 2