Merge pull request #155 from micmac1/PR