Merge pull request #9 from heniancheng/master

Merge
save
Merge remote-tracking branch 'upstream/master'
save