Merge pull request #178 from micmac1/master