Revised geometry #2: even more consistent algorithm
Merge pull request #47 from stanislaw/master

Revised geometry #2: even more consistent algorithm