Merge pull request #117 from mayurjadhav/RG-156

Worked on RG-156