Merge pull request #177 from fsb4000/patch-1