Merge pull request #2 from JasonGuanGitHub/master

pull request