Part of PR: 4531 Submitted by: Pedro Giffuni <giffunip@asme.org>
Closes PR #2289. Submitted by: pgiffuni@FPS.biblos.unal.edu.co