Addressing comments from issue #18