Changes in response to comments to PR #30