Added pull request from @coupgar