Adapt the documentation to the master snapshot
Merge pull request #202 from akkie/doc

Adapt the documentation to the master snapshot