add: comments
add: notes
Merge branch 'master' into gh-pages