Merge pull request #471 from micmac1/pj29