fix #274
Merge pull request #275 from xiechao06/issue274

fix #274
Merge remote-tracking branch 'origin/master' into issue273
fix #273