Merge pull request #183 from micmac1/master