Minor change.
Add utf-8 support and add missing import.