diff --git a/source/python/classes/ControlFile.py b/source/python/classes/ControlFile.py
index 2fb50142303d7a77c59ec24f39dbef8a26cda275..5d11c654e5a951f43bfcd82c749f59eaf59b60a2 100644
--- a/source/python/classes/ControlFile.py
+++ b/source/python/classes/ControlFile.py
@@ -192,6 +192,12 @@ class ControlFile(object):
 
         # go through every line and store parameter
         for ldata in fdata:
+            if ldata and ldata[0] == '#':
+                # ignore comment line in control file
+                continue
+            if '#' in ldata:
+                # cut off comment
+                ldata = ldata.split('#')[0]
             data = ldata.split()
             if len(data) > 1:
                 if 'm_' in data[0].lower():