Merge pull request #2 from JasonGuanGitHub/master

pull from the master
Merge pull request #32 from jitongming/master

merge request from JasonGuan