minor changes
Merge branch 'ImageAnalysis' into develop