PR #118

PR #118 is not in the merge queue.