PR #95

PR #95 is not in the merge queue.