Merge @mniip unicode and console branch