Completed issue #20.