Implementation and tests for issue #13