Merge pull request #93 from fsb4000/patch-1