Merge pull request #704 from ovatsus/master

Html Fixes [Work in Progress]
Fix UT (line endings issue)
More tests