Extracted the img replacement into a plugin
Added spaces around params
Merge remote-tracking branch 'CaseyLeask/extract-img-replacement'