Merge pull request #1 from fsb4000/patch-1