Feature/imageoptimization