forslund Merge pull request #27 from forslund/cps-update