Manual merge of pull request #21