added support for multi-line expressions