0.4.2 Fix #16 (see also #10)