Merge pull request #1 from bytemarkjlawrie/patch-1