Merge pull request #8 from CBluowei/master

refactor code