Merge pull request #126 from rdymac/patch-20