Triplet use in geometry package
Removal of types in interface definitions
Merge remote-tracking branch 'origin/master'