Improve the documentation
Merge pull request #820 from bem/issues/818@v2

Improve the documentation