merge of #5