Merge pull request #56 from mayurjadhav/RG-103

worked on RG-103
worked on RG-123
Merge pull request #57 from Edzelopez/RG-123

worked on RG-123
RG-103 status was accidently changed by me