PR #3

PR #3 is not in the merge queue.