Addressing issues for pull request #17.