Working on issue #10.