#334 #335 #345 Fix wrong language string
#334 Fix language string
Merge branch 'version2.1' into version2.2
#335 Fix string issues