Speed up post proc.
Merge pull request #387 from nZEDb/dev

Speed up post proc.