RG-116 --worked on issues
Merge pull request #50 from Edzelopez/RG-116

RG-116 --worked on issues