fix #20
fix #20
more clear
rename
Merge pull request #22 from xiechao06/issue20

fix #20