Update master
Use utf-8