refact
Merge pull request #32 from pengzhanlee/master

refact