Stabilized s2verify code for the non-exceptional cases.
Merge branch 'master' of https://github.com/resultares/esolutions