clunky concept eval added
Merge branches 'master' and 'spalakod/evaluator'