Merge pull request #97 from fsb4000/patch-3