Working on issue #16.