added support for {variables} within {variables} and fixed multiline server-side comments