merge master into gh-pages for live demo updates