Paul Robert Lloyd Merge pull request #3 from maban/patch-1