Further improve evaluation.
Merge branch 'master' of github.com:skieffer/ortho