Added pull request #4 manually.