Resolves issue #abcd. Code is rebased on origin/master. Add tests that fail without your changes. Update all relevant documentation.