Developing a function to trim a UTF-8 file.
Merge branch 'master', fix conflict