Merge pull request #1558 from hauke/pps-tools