PR #12

PR #12 is not in the merge queue.