Merge pull request #181 from markcarver/patch-1