Merge pull request #1 from jianyuan/master

Update
Merge pull request #7 from wallgig/master

Merge pull request #1 from jianyuan/master