fix issure#3
code refactor
Merge pull request #4 from qhwa/master

解决 issure#3