manual merge of pull #5