Merge pull request #109 from fsb4000/patch-1