Fix lexer and parser
add self-closing tags support
Merge branch 'master' of github.com:troch/impartial