cleaned up evaluator
Merge branch 'master' of https://github.com/aclevine/ISO-space