Merge pull request #82 from sunryuan/master

fix bugs
refactor
refactor