modified images and company right color
Merge branch 'master' into test-interface