update readme
Merge branch 'master' into gh-pages
upate demo
update readme
Merge branch 'master' into gh-pages