diff --git a/muncher/muncher.py b/muncher/muncher.py
old mode 100644
new mode 100755
index be58298..6ae3e84
--- a/muncher/muncher.py
+++ b/muncher/muncher.py
@@ -269,8 +269,8 @@ def processCssFile(self, path, inline = False):
             for block in blocks:
                 contents = contents + block
 
-        ids_found = re.findall(r'((?<!\:\s)(?<!\:)#\w+)(\.|\{|,|\s|#)', contents, re.DOTALL)
-        classes_found = re.findall(r'(?!\.[0-9])\.\w+', contents)
+        ids_found = re.findall(r'((?<!\:\s)(?<!\:)#[\w-]+)(\.|\{|,|\s|#)', contents, re.DOTALL)
+        classes_found = re.findall(r'(?!\.[0-9])\.[\w-]+', contents)
         self.addIds(ids_found)
         self.addClasses(classes_found)