updating docs from master