CRLF and quotes bug fixed
Merge pull request #1 from ra27/crlf_bug_fix

CRLF and quotes bug fixed