Merge pull request #136 from fsb4000/patch-1