PR #17

PR #17 is not in the merge queue.