完善代码
Merge remote-tracking branch 'tangxuehua/master'