PR #156

PR #156 is not in the merge queue.