PR #23

PR #23 is not in the merge queue.