Pt/native crlf (with updates)

This is another iteration on top of pull request #77 in an attempt to get issue #57 fixed.