refactory
Merge pull request #4 from TimGuan/master

refactory