fix bugs
Merge branch 'bowen' into Bohan-Zheng
搞定了
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen