Fixes #292, and improved documentation.
Merge branch 'enhancement/292'