add coding: utf-8
merge & fix readme.txt