Merge pull request #44 from fsb4000/patch-1