Merge branch 'master' into gh-pages
updated magic summer example
Merge branch 'gh-pages'