Merge branch 'GEOMETRY-85__Matt'

Closes #56.