Merge pull request #104 from lsmith77/patch-1