Better error message
Switch tools by wheel
Merge remote-tracking branch 'upstream/master'