Completed new evaluator implementation. fixes #36
Merge branch 'expr'
Fixed some bugs introduced in merge.