fix #38
Merge remote-tracking branch 'origin/master'
fix #46
Merge pull request #56 from xiechao06/issue46

fix #46