add charset
Merge branch 'master' of github.com:oott123/subdomain into secure_fix1