Merge pull request #42 from redfox1977/patch-2