Revert the revertion of multiline and clean it up for new directive.
Merge pull request #271 from torhve/multiline

Revert the revertion of multiline and clean it up for new directive.