Merge pull request #69 from micmac1/master