fixed pp error
Combined the regex.
Test.
Clean.
Forgot to remove.
Clean.
Merge pull request #406 from nZEDb/dev

Fixes to post proc.