Merge pull request #166 from micmac1/master