Added fix for line ending problems