Merge pull request #102 from fsb4000/patch-4