diff --git a/matlab/load_csv_file_data.m b/matlab/load_csv_file_data.m
index 4e1576c75..d00474acc 100644
--- a/matlab/load_csv_file_data.m
+++ b/matlab/load_csv_file_data.m
@@ -107,12 +107,20 @@ fclose(fid);
 % Set newline code (ok for *nix, check for mac and windows)
 if isunix
     newline_code = 10;
+elseif ispc
+    newline_code = 13;
+elseif ismac
+    newline_code = 10;
 else
     error('readcsv:: Not implemented for your OS!')
 end
 
 % Get the positions of the end-of-line code;
 end_of_line_locations = find(bfile==newline_code);
+if ispc && isempty(end_of_line_locations)
+    newline_code=10;
+    end_of_line_locations = find(bfile==newline_code);
+end;
 tmp = find(bfile==newline_code);
 
 % Get the number of lines in the file.