Merge pull request #1 from JasonGuanGitHub/master

merge pull request form Jason