update
Imporoved handling the UTF8.