diff --git a/TODO b/TODO
index ac89013..27036e0 100644
--- a/TODO
+++ b/TODO
@@ -126,15 +126,6 @@ Feature
 Stuff to do before 0.6.0 release:
 =================================
 
-[man page]
-* write man page entry for: --evdev-absmap ABS_X2+=RT,-ABS_X2+=LT to allow mapping of
-  half-axes (syntax is inconsistent with axis inverting)
-
-[polish]
-
-* allow both ';' and '#' as comment character, compatibilty with
-  KEY_#34 should work by requiring a space before a comment
-
 * add Playstation3 controller config to examples, convert to ini (done)
   needs new config for bluetooth mode
 
diff --git a/src/ini_parser.cpp b/src/ini_parser.cpp
index 907b295..a830aeb 100644
--- a/src/ini_parser.cpp
+++ b/src/ini_parser.cpp
@@ -47,7 +47,7 @@ INIParser::run()
       m_builder.send_section(get_section());
       expect(']');
       whitespace();
-      if (accept(';'))
+      if (accept(';') || accept('#'))
         eat_rest_of_line();
       newline();
     }
@@ -55,7 +55,7 @@ INIParser::run()
     {
       // eat whitespace
     }
-    else if (accept(';'))
+    else if (accept(';') || accept('#'))
     {
       eat_rest_of_line();
       newline();
@@ -69,7 +69,7 @@ INIParser::run()
       whitespace();
       expect('=');
       whitespace();
-      if (accept(';'))
+      if (accept(';') || accept('#'))
       { // "foobar = ; comment here, value empty"
         eat_rest_of_line();
         newline();
@@ -87,7 +87,7 @@ INIParser::run()
         }
 
         whitespace();
-        if (accept(';'))
+        if (accept(';') || accept('#'))
           eat_rest_of_line();
         newline();
       }