added cname
Merge branch 'beta'