Merge pull request #73 from fsb4000/patch-1