PR #128

PR #128 is not in the merge queue.