Issue 138, non-latin char orgs.
added new test cases for issue 139
Merge remote-tracking branch 'upstream/master'
Merge pull request #144 from hhovsepy/master

added new test cases from github issues