Fix some problems with the rendered HTML
Merge pull request #8 from tomphp/bugfix/issue-6

Fix some problems with the rendered HTML