added HTML support