Merge pull request #1 from zhaovin/master

pull latest
Merge pull request #2 from yehua98/master

Merge pull request #1 from zhaovin/master