Merge pull request #144 from micmac1/PR