fix issue #492
Merge pull request #493 from LightTao/master

fix issue #492