Added support for multiple lines
Merge