Merge pull request #101 from mayurjadhav/RG-150

Worked on RG-150
RG-154 Changed delimiter
Merge pull request #102 from Edzelopez/RG-154

RG-154 Changed delimiter