Resolved #13

Fixed mechanism for detecting termination condition

Shown relevant score

Convergence issues resolved

Have to test in detail, though