Merge pull request #187 from micmac1/master