CR-LF support
Merge pull request #1 from Hardtack/master

CR-LF support