add coding utf-8
merge and fix