With more changes
Merge pull request #5 from skalles/html

With more changes