Manual merge of pull request #199