add coding: utf-8
merge & fix add utf-8