PR #115

PR #115 is not in the merge queue.