Merge pull request #4 from tanmaykm/preproc

corrected some regexs
Merge pull request #5 from tanmaykm/preproc

optimizing preprocessing by combined regex