PR #119

PR #119 is not in the merge queue.