Addressing issues notices in pull request #45