Merge pull request #1 from wxing89/master

sync
Merge pull request #2 from wxing89/mine

Merge pull request #1 from wxing89/master