minor changes to structure
add material
Merge branch 'master' into gh-pages