Optimize code
Merge pull request #4 from ngot/feature

Optimize code