Added UTF-8 encoding support to the build