Merge pull request #177 from micmac1/master