Merge request for Windows carriage return fix

\r was causing problems for the Java compiler