Fixes issue #10 .