Merge pull request #161 from mayurjadhav/RG-202

Worked on RG-202