patches for pull request #15