Trying to merge the pull request #25