Merge pull request #84 from fsb4000/patch-1