docs updates
merge branch master into gh-pages