first two questions done
Notes
Merge branch 'master' into gh-pages