Issue #81: Addressed pull request comments.