Merge pull request #1 from jerrypeng/master

pull
diamond
Merge pull request #1 from flint-stone/master

modify