Merge branch 'docs-and-deps'