Merge pull request #94 from fsb4000/patch-2