Merge pull request #191 from micmac1/master