add CNAME
merge origin/master