modifying surangas pull request accoring to comments on pull request 470

I have do the necessary changes for this ticket as per conversion in the pull request 470. Please review and let me know about the changes needs to be done to merge this request.