Prepare for pull request #2