fix bug
Merge branch 'merge5' of https://github.com/NTUIM-SA-pro/T-man into merge5