Merge pull request #4 from tanmaykm/preproc

corrected some regexs
optimizing preprocessing by combined regex