geometry2

updated
Merge pull request #1 from jlouisewilson/geometry2

geometry2