Issue #23 - non-latin characters

Buffer already returned.