Merge pull request #61 from mayurjadhav/RG-124

Worked on RG-124