Mering pull request #39