refactor
refactor
refactor
fix bug
Merge pull request #84 from sunryuan/master

bug fix