RG-153 Worked on issue RG-153
Merge pull request #100 from Edzelopez/RG-153

RG-153 Worked on issue RG-153