Unicode work

Rework of TheMightyBuzzard's code in Pull #236