Merge pull request #98 from martinsh-shaiters/devel

Implementation & unit test for enhancement described in issue #74