Merge pull request #119 from mayurjadhav/RG-155

Worked on RG-155
Worked on RG-155 to fixed notice