updated to address issue #74