Merge pull request #170 from roskoff/preserve_line_breaks