Tiny partial merge of Issue #44