Added changes requested in pull request.