Updated build to support UTF-8 Encoding