Merge pull request #154 from micmac1/PR