Merge pull request #51 from j-xiong/master

psm provider bug fixes