Merge pull request #5 from 1sters/master

merge master
Merge pull request #6 from 1sters/master

merge master
Merge pull request #7 from 1sters/master

merge master
细节修改，未修改翻译
Merge pull request #224 from poppinlp/fix

细节修改