Merge pull request #352 from chocolateboy/decontaminate_stdout