Simplified html-helper. Now it is somewhat useful.
Merge remote-tracking branch 'origin/master'