PR #117

PR #117 is not in the merge queue.