issue #10 and tests changes accordingly