Merge branch 'GEOMETRY-62__Matt'

Closes #44.