Improve documentation

Closed issue #34