PR #28

PR #28 is not in the merge queue.