docs for beta 6
Merge pull request #308 from patrickarlt/master

Docs for beta 6