issue #36 complete