Merge pull request #3 from ngot/feature

Feature
Merge pull request #4 from ngot/feature

Optimize code