Test to make unicode support wor
merge origin master