Addressing issue #15 and #16