Minor Changes

Conflict between scene_analyser and image_analyzer