Merge pull request #172 from micmac1/master