Merge pull request #290 from tomato42/docs-updates

Docs updates