Merge pull request #170 from micmac1/master