PR: 3871 Submitted by: Pedro Giffuni S. <pgiffuni@FPS.biblos.unal.edu.co>
Closes PR #2237. Submitted by: Pedro Giffuni <pgiffuni@FPS.biblos.unal.edu.co>