New geometry scenarios
Merge remote-tracking branch 'ianna/new-geometry-scenarios' into mergeIanna_new-geometry-scenarios
Implemented @dildick's comments for pull request #2304
Merge pull request #9 from mark-grimes/mergeIanna_new-geometry-scenarios

Implementing dildick's comments for pull request 2304
Merge pull request #2304 from ianna/new-geometry-scenarios

New geometry scenarios