PR #42

PR #42 is not in the merge queue.