Refactored geometric operations
Merge pull request #23 from spalte/geometryrefactoring

Refactored geometric operations