Addressing issue #10