Merge branch 'master' into gh-pages
Moved examples into each own files
Merge branch 'gh-pages'