Adjustments for pull request #1