Merge pull request #1952 from esdrubal/proc_name