manually merging Paulo's PR #10/2 [0899ec6]