fixed #608, #610
Merge remote-tracking branch 'upstream/master'