continue doc work
Merge pull request #258 from patrickarlt/beta5

Continue doc work