PR #123

PR #123 is not in the merge queue.