PR #154

PR #154 is not in the merge queue.