refactor
Merge pull request #183 from leoliang/master

refactor