fix issue #933 and Windows like line ends (CRLF)
Merge pull request #1011 from DerPate/master

fix issue #933 and Windows like line ends (CRLF)