Merge pull request #188 from micmac1/master