Addressing issue #18.