Merge pull request #175 from micmac1/master