refactoring
Merge pull request #10 from yiqunc/master

refactoring