Proper HTML, fixes Issue #3