Merge pull request #485 from micmac1/pj-pc