Merge pull request #1 from marty80/patch-2

Patch 2