Support multi-line argument values (#624)

Pull request for this change as requested.