Added multiline support
small changes