Fixed the CNAME record.
Fixed CNAME again.
Updated code.
Merge branch 'dev' into gh-pages