Added a few things to note
Merge branch 'master' into gh-pages