Address pull request #1 and issue #2