Small adjustments for pull request #1