Merge pull request #131 from fsb4000/patch-1