CR Fix
Git required me to commit these changes
Merge pull request #1042 from marcosgdf/develop

CR Fix