Edit of pull request #79