Feature/non ascii chars

Handle non-ascii characters