Closes pull request 54