Accepted pull request #3