updated version
changed allowed type from html (as per docs) to html5 (as per reality)
merge errors fixed