Update

updated code, images.
Merge branch 'master' into gh-pages