diff --git a/src/main/java/de/hftstuttgart/dtt/Testrunner.java b/src/main/java/de/hftstuttgart/dtt/Testrunner.java
index 7e3ddcb3ba14ea98c4809ed8a94c2b87a1869d30..d0cc8623982cfc7dcebd7169f96cb80c7734217e 100644
--- a/src/main/java/de/hftstuttgart/dtt/Testrunner.java
+++ b/src/main/java/de/hftstuttgart/dtt/Testrunner.java
@@ -163,9 +163,11 @@ public class Testrunner
         options.add("-d"); // output dir
         options.add(outputDir.getAbsolutePath());
         options.add("-cp"); // custom classpath
+        String os=System.getProperty("os.name");
+        final String osSpecificCpDelim=(os.indexOf("Windows")>-1?";":":");
         String cp = buildClassPath(classPathItems).stream()
             .map(f -> f.getPath())
-            .reduce((s1, s2) -> s1 + ":" + s2).orElse("");
+            .reduce((s1, s2) -> s1 + osSpecificCpDelim + s2).orElse("");
         LOG.info("classpath for compilation: " + cp);
         options.add(cp);
 
@@ -213,10 +215,12 @@ public class Testrunner
         return compilationErrors.stream().map(e ->
         {
             Result result = new Result();
-            Pattern pattern = Pattern.compile(String.format("^.*%s(.*\\.java).*$", File.separator));
-            Matcher matcher = pattern.matcher(String.valueOf(e.getSource()));
-
-            result.name = (matcher.matches() && matcher.group(1) != null) ? matcher.group(1) : String.valueOf(e.getSource());
+//            Pattern pattern = Pattern.compile(String.format("^.*%s(.*\\.java).*$", File.separator));
+//            Matcher matcher = pattern.matcher(String.valueOf(e.getSource()));
+//
+//            result.name = (matcher.matches() && matcher.group(1) != null) ? matcher.group(1) : String.valueOf(e.getSource());
+            String sourcePath=String.valueOf(e.getSource());
+            result.name=sourcePath.substring(sourcePath.lastIndexOf(File.separator)+1, sourcePath.length()-1);
             result.state = Result.State.COMPILATIONERROR.ordinal();
             result.failureReason = e.getMessage(Locale.ENGLISH);
             result.failureType = "Compilation Failed";