Merge pull request #204 from micmac1/master