Merge pull request #139 from micmac1/PR