PR #37

PR #37 is not in the merge queue.