capifony and html fixes
Merge pull request #31 from liuggio/html

capifony and html fixes