Issue 3 fix s2 edge

This fixes #3 (closed), plus some cleanup in separate commit.

Merge request reports

Loading