fix #60
Merge remote-tracking branch 'origin/master'
fix #60
Merge pull request #68 from xiechao06/issue60

fix #60