working on issue #61 (in progress)