fix bug
Merge branch 'master' of github.com:wangjingbupt/tb2
init