PR: 10374 Submitted by: Pedro F. Giffuni <pfgiffuni@bachue.usc.unal.edu.co>
Closes PR #2156. Submitted by: Pedro Giffuni <pgiffuni@fps.biblos.unal.edu.co>