Update, Fix for Multiline

Small changes, but usefull.
Fix for multiline-support