Merge pull request #120 from mayurjadhav/RG-155

Worked on RG-155 to fixed notice