Merge pull request #2 from JasonGuanGitHub/master

pull request
Merge pull request #5 from specialhappy/master

Merge pull request #2 from JasonGuanGitHub/master