PR #15

PR #15 is not in the merge queue.