Merge pull request #68 from mayurjadhav/RG-136

Worked on RG-136