Remove unused regexes
Add support for self-closing tags. Fixes #3