fix #2 -Changed param to : instead of @ - Added new regex for escapi...