Addressing issue #15