Worked on RG-123
Merge pull request #86 from mayurjadhav/RG-123

Worked on RG-123