diff --git a/hamlpy/elements.py b/hamlpy/elements.py
index <HASH>..<HASH> 100644
--- a/hamlpy/elements.py
+++ b/hamlpy/elements.py
@@ -4,13 +4,13 @@ import re
 class Element(object):
     """contains the pieces of an element and can populate itself from haml element text"""
     
-    self_closing_tags = ('meta', 'img', 'link', 'script', 'br', 'hr')
+    self_closing_tags = ('meta', 'img', 'link', 'br', 'hr')
 
     ELEMENT = '%'
     ID = '#'
     CLASS = '.'
 
-    HAML_REGEX = re.compile(r"(?P<tag>%\w+)?(?P<id>#\w*)?(?P<class>\.[\w\.-]*)*(?P<attributes>\{.*\})?(?P<selfclose>/)?(?P<django>=)?(?P<inline>[^\w\.#\{].*)?")
+    HAML_REGEX = re.compile(r"(?P<tag>%\w+)?(?P<id>#[\w-]*)?(?P<class>\.[\w\.-]*)*(?P<attributes>\{.*\})?(?P<selfclose>/)?(?P<django>=)?(?P<inline>[^\w\.#\{].*)?")
     
     def __init__(self, haml):
         self.haml = haml
adding hyphens to the CSS selector regex