Fixed error message for setImage
Merge remote-tracking branch 'origin/master'