PR #111

PR #111 is not in the merge queue.