Multi-line support added.
Merge branch 'Kris_MultiLine' into develop