Updated triangulation interface.
Merge branch 'triangulation'