Merge pull request #90 from Edzelopez/RG-140

RG-140 Fixed notices
Worked on RG-123
Merge pull request #91 from mayurjadhav/RG-123

Worked on RG-123