done issue #44; work on issue #41