Incorporate files and edits from other Image Segmentation branch
Merge pull request #714 from aamcbee/ImageSegment2

Incorporate files and edits from other Image Segmentation branch