PR #11

PR #11 is not in the merge queue.