docs
Merge branch 'master' into docs
Merge pull request #6 from jtushman/docs

Docs