PR #160

PR #160 is not in the merge queue.