Actual tiny merge of Issue #44