Revised geometry: more consistent algorithm
Merge pull request #46 from stanislaw/master

Revised geometry: more consistent algorithm