Manual merge of pull request #35