Merge pull request #6 from yehua98/master

pull latest
Merge pull request #5 from zhaovin/master

Merge pull request #6 from yehua98/master