lukehoban Merge pull request #110 from timbaileyjones/patch-1