Merge pull request #148 from micmac1/PR