Fix more multiline cases
Merge pull request #2 from brain-geek/master

More fixes to multiline case