incorporated feedback from PR #42