#340 #341 #343 Fix UTF-8 issues
#340 Fix URF-8 issue
Merge branch 'version2.1' into version2.2