Merge pull request #505 from ovatsus/HtmlTypeProvider

Change HtmlProvider to follow other providers more closely