Merge pull request #184 from micmac1/master