Merge branch 'GEOMETRY-63__Matt'

Closes #55.