Merge pull request #695 from eileenmcnaughton/eval