PR #320

PR #320 is not in the merge queue.