Demo url change
Readme change
Merge branch 'master' into gh-pages with readme