Merge pull request #49 from redfox1977/patch-8