CNAME
Merge pull request #1 from magdmartin/master

merge new changes