Modifications made according to pull request #60