Merge pull request #2 from renshan/develop

merge
Reviewing and correcting
Merge pull request #103 from gagugagu/develop

Reviewing and correcting