Merge pull request #378 from nortikin/docs-pass-1

Docs pass 1
Merge remote-tracking branch 'origin/master' into docs-pass-1