fixed #402
fixed #402
Merge remote-tracking branch 'origin/master'