Working on issue #11.