PR #7

PR #7 is not in the merge queue.