Fixed problem with white spaces and line ends