Merge pull request #54 from thexerocouk/patch-1