Merge pull request #114 from mayurjadhav/RG-145

Worked on RG-145