added support for use of variables in binary operations