Merge pull request #44 from Edzelopez/RG-116

RG-116 Fixed issues found during QA
RG-116 Removed magic numbers