Add ENCODING_UTF8 option that adds encoding comment