updates for new evaluator facility
Merge pull request #14 from istudens/evaluator

updates for new evaluator facility