Fixed bug with accaunting wide char strings
naum
Merge to development from master. Wide char bug fix.

Merge branch 'master' into development