Started work on issue #5.