fixed #550
undo
Merge remote-tracking branch 'origin/master'