Temp rename CNAME file
Update index.html to support extended
Merge remote-tracking branch 'origin/master' into gh-pages