sjm
merge with master
Merge branch 'zhouyongjian' of github.com:spidermandl/TimeMaster into zhouyongjian