take care of unicode.
Merge branch 'develop'