lidongxu
xiaoxiugai
Merge pull request #4 from brightac2013/master

lgj修改修改