Merge pull request #347 from pjd/pullreq