Added html encoding & decoding