Issue #18: changes based on pull request feedback