PR #120

PR #120 is not in the merge queue.