Working with images for production
Merge remote-tracking branch 'origin/master' into windowFlickering