Changes for UTF-8 file encoding