CNAME added
Merge branch 'cname'