starting work on issue #38