Merge pull request #1 from wychootf4/master

no change 10/13
Merge pull request #2 from wychootf4/master

wangba
Merge pull request #3 from wychootf4/master

update
Merge pull request #1 from shiyin88/master

update