Adding support for newlines