fixes for non Latin entries
Merge pull request #90 from gabriele-v/master

Minor fix
Merge pull request #91 from vomikan/master

fixes for non Latin entries