Worked on RG-163
Merge pull request #109 from mayurjadhav/RG-163

Worked on RG-163