diff --git a/src/main/java/MainClasses/Config.java b/src/main/java/MainClasses/Config.java
index 356e1e6611ff04946dcf797513c5c98cd587045f..58f1b75995832fe48f82c7b19b07be2bbb5eab1a 100644
--- a/src/main/java/MainClasses/Config.java
+++ b/src/main/java/MainClasses/Config.java
@@ -152,7 +152,7 @@ public class Config {
         // Output settings
         jobName = this.properties.getProperty("jobName");
         if(jobName.equals("")) {
-            SimpleDateFormat formatter = new SimpleDateFormat("ddMMyyyyHHmmss");
+            SimpleDateFormat formatter = new SimpleDateFormat("dd_MM_yyyy_HH-mm-ss");
             Date date = new Date();
             jobName = formatter.format(date);
         }
diff --git a/src/main/resources/genetic.properties b/src/main/resources/genetic.properties
index 117b374a31e4e916864b04ffa10a3ff9ba3a170b..0649659923cf8cb95fe458a7439e7e7341e49591 100644
--- a/src/main/resources/genetic.properties
+++ b/src/main/resources/genetic.properties
@@ -49,7 +49,7 @@
     # log = Generate tab seperated file with a bit of information about each generation
     # generation = print a short overview about each generation to stdout
         visualizerType = log,generation,image,video
-    # Name of the job, filenames will be based on this name. If left empty a timestamp is used TODO: leaving it empty should use timestamp
+    # Name of the job, filenames will be based on this name. If left empty a timestamp is used
         jobName =
     # Directory for the image sequence
         imageSequenceDirectory = visualization/series