added readme
fixed conflict
Fixed conversion problem
Merge branch 'hotfix/check_unicode_prob' into develop