changes as per PR #1 comments