Merge pull request #122 from fsb4000/patch-1