Merge pull request #2 from mrcsmcln/patch-3