gaoqiang submit
Merge branch 'master' of https://github.com/coderfengyun/TCSE2012