Fix bug with self closing tags
Merge branch 'hotfix/1.0.3-self-closing-tags'