Merge commit
Added stack-based evaluator