Merge pull request #1 from xiangchuanxc/master

Update
Merge pull request #2 from xiangchuanxc/master

delete
xxxxxx
Merge pull request #2 from MingleChang/master

xxxxxx