Merge pull request #108 from j-xiong/master

prov/psm: code cleanup