Changing image_input by image
Merge remote-tracking branch 'upstream/master'