Merge pull request #42 from Edzelopez/RG-116

RG-116 Fixed issues found during QA
Merge pull request #43 from Edzelopez/RG-116

RG-116 Fixed issues found during QA
RG-116 Fixed issues found during QA