Improve HTML Document selectors
Merge branch 'master' of https://github.com/tenebras/Kalibri