Merge pull request #103 from mayurjadhav/RG-96

Worked on RG-96