diff --git a/README.md b/README.md
index 5705284..b20d47e 100644
--- a/README.md
+++ b/README.md
@@ -130,6 +130,8 @@ The most useful one is `$AUTORANDR_CURRENT_PROFILE`.
 
 ## Changelog
 
+* *2017-01-18* Accept comments (lines starting with `#`) in config/setup files
+
 **autorandr 1.0**
 
 * *2016-12-07* Tag the current code as version 1.0.0; see github issue #54
diff --git a/autorandr.py b/autorandr.py
index f62ad07..a47282f 100755
--- a/autorandr.py
+++ b/autorandr.py
@@ -345,6 +345,8 @@ class XrandrOutput(object):
         for line in configuration.split("\n"):
             if line:
                 line = line.split(None, 1)
+                if line and line[0].startswith("#"):
+                    continue
                 options[line[0]] = line[1] if len(line) > 1 else None
 
         edid = None
@@ -464,7 +466,7 @@ def load_profiles(profile_path):
         if not os.path.isfile(config_name) or not os.path.isfile(setup_name):
             continue
 
-        edids = dict([ x.strip().split() for x in open(setup_name).readlines() if x.strip() ])
+        edids = dict([ x.split() for x in (y.strip() for y in open(setup_name).readlines()) if x and x[0] != "#" ])
 
         config = {}
         buffer = []