Merge unicode branch