PR #16

PR #16 is not in the merge queue.