Merge pull request #115 from mayurjadhav/RG-166

Worked on RG-166