Merge branch 'gh-pages'
put link on demo site
proper scale
Merge branch 'master' into gh-pages