fix #273
Merge remote-tracking branch 'origin/master' into issue273
fix #273
Merge pull request #279 from xiechao06/issue273

Issue273