Unicode overhaul
merge