Merge pull request #116 from rdymac/patch-15