Adding CNAME; closes #11