Merge pull request #156 from ncoghlan/patch-1