Changed how we deal with lineEnding
Fixed import problem