see pull request #36