Merge pull request #4 from zhaovin/master

pull latest
Merge pull request #6 from yehua98/master

pull latest