PR #129

PR #129 is not in the merge queue.