Html5

Works towards issue #346