Merge pull request #1 from renshan/develop

merge
review
review

Is it a reviewing or a translating job?
Merge pull request #74 from gagugagu/develop

review