richo Merge pull request #8 from jez/patch-1