Morning commit

Added contain="yes" to some images
fixed inspection
Merge branch 'Dustin'
Merge branch 'master' into Dustin