Updating pull request #25