manually merging Paulo's PR #10/1 [98e19f2]