PR #20

PR #20 is not in the merge queue.