Merge pull request #183 from fsb4000/patch-1