GeometricCalc- Working copy

Attempt to commit 2x
Add suppress warnings
test commit
Merge remote-tracking branch 'origin/master'