tweak comments at the top
Merge branch 'master' into gh-pages
update