Added accented chars support