PR #13

PR #13 is not in the merge queue.