Working on issue #61.
Still working on issue #61.