Merge pull request #261 from micmac1/master