Merge branch 'dev/kenju'
Merge remote-tracking branch 'origin/master' into gh-pages
Adding CNAME record