Improve documentation
Merge pull request #504 from markus1189/docs

Improve documentation