Merge pull request #1 from JasonGuanGitHub/master