fix #36
refactor
Merge pull request #43 from xiechao06/issue36

fix #36