Merge branches 'gh-pages' and 'master' into gh-pages
Link to github pages demo
Merge branches 'master' and 'gh-pages'