PR #158

PR #158 is not in the merge queue.