Add images plus a minor change
Merge remote-tracking branch 'upstream/master'