Added HTML parsing support ; cleaned the code