Merge pull request #108 from mayurjadhav/RG-163

Worked on RG-163
Worked on RG-163