Merge pull request #202 from micmac1/master