Upgrade html cleaner

Ticket #38