Merge pull request #611 from iskiselev/ExpressionEngineUpdate

Expression engine update
Expression Interpreter updated with #491 fix.