add unicode method
Merge branch 'develop'