Merge pull request #8 from JasonGuanGitHub/master

update from Jason