Merge pull request #1 from xiaobeicn/master

merge from origin