Merge pull request #48 from redfox1977/patch-7