Worked on RG-160
Merge pull request #106 from mayurjadhav/RG-160

Worked on RG-160