got rid of geometry warnings in preprocessor
Merge remote-tracking branch 'kus/coupling' into coupling