Entities i18n

A few bugs + conversion to Unicode