fix bugs in last commit
Merge remote-tracking branch 'origin/master'
fix bugs in last commit