Merge pull request #160 from micmac1/master