Merge branch 'GEOMETRY-71__Matt'

Closes #57.