removed utf encode
Merge origin/master