Merge pull request #69 from mayurjadhav/RG-135

Worked on RG-135