Feature/image manipulation