Merge pull request #708 from ovatsus/master

Html Fixes