Changed img to 1245
Merge remote-tracking branch 'origin/master'