Completion of Issue #18.