Merge pull request #179 from micmac1/master