RG-204, RG-205 Worked on issues
Merge pull request #163 from Edzelopez/RG-204

RG-204, RG-205 Worked on issues