Merge pull request #518 from ovatsus/master

Improve docs (closes #515)