Merge pull request #10 from djm/patch-1