Added StripHTML class
Fixed merge conflict