PR #38

PR #38 is not in the merge queue.