fix unicode problem
Merge branch 'nan'